Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

openssl: 1.1.1q -> 1.1.1r #195539

Merged
merged 2 commits into from
Oct 11, 2022
Merged

openssl: 1.1.1q -> 1.1.1r #195539

merged 2 commits into from
Oct 11, 2022

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Oct 11, 2022 •
edited by mweinelt
Loading

Description of changes

bugfix release, does not fix any security issues

Will cause a conflict with #195537

Backport to staging-22.05, because 1.1.1 is default on 22.05.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ajs124 ajs124 marked this pull request as draft October 11, 2022 18:03
@ajs124 ajs124 changed the base branch from master to staging October 11, 2022 18:03
@ajs124 ajs124 changed the base branch from staging to master October 11, 2022 18:09
@ofborg ofborg bot requested a review from adevress October 11, 2022 18:57
@ajs124
openssl: 1.1.1q -> 1.1.1r
0bf7095 
bugfix release, does not fix any security issues
@ajs124
Revert "krb5: use openssl_1_1"
9247a66 
This reverts commit 498d67e.

not needed anymore after cfebc8f

This way, updating openssl_1_1 shouldn't be a darwin stdenv rebuild
anymore.
@ajs124 ajs124 changed the base branch from master to staging October 11, 2022 20:31
@ajs124 ajs124 marked this pull request as ready for review October 11, 2022 20:31
@mweinelt mweinelt merged commit 1a0c8a4 into NixOS:staging Oct 11, 2022
@ajs124 ajs124 deleted the upd/openssl_1_1 branch October 11, 2022 21:38
@github-actions
Copy link
Contributor

Backport failed for staging-22.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-22.05
git worktree add -d .worktree/backport-195539-to-staging-22.05 origin/staging-22.05
cd .worktree/backport-195539-to-staging-22.05
git checkout -b backport-195539-to-staging-22.05
ancref=$(git merge-base c3ddd95cf24639a6115c7756d78d9946e609e554 9247a6667c5e44bcd98f2f4415f0579bd0b1467a)
git cherry-pick -x $ancref..9247a6667c5e44bcd98f2f4415f0579bd0b1467a

@ajs124
Copy link
Member Author

ajs124 commented Oct 11, 2022

backport in #195591

@yorickvP
Copy link
Contributor

https://mta.openssl.org/pipermail/openssl-announce/2022-October/000237.html

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mweinelt mweinelt Awaiting requested review from mweinelt

@vcunat vcunat Awaiting requested review from vcunat

@np np Awaiting requested review from np

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@edolstra edolstra Awaiting requested review from edolstra

@adevress adevress Awaiting requested review from adevress

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ajs124 @yorickvP @mweinelt